chore(client): move the client to its own subfolder #1838

daniellacosse · 2024-02-12T19:07:26Z

I was able to successfully move the client into its own subfolder:

TODO:

should i move build into the root? or try to mess with ROOT_DIR?
basic documentation
move third_party into the root (need help from @jyyi1)
unbreak it... again
- electron
- windows (it can't find the env.nsh)
- android working in the CI (dialer.Dial undefined??)
- maccatalyst working in the CI

client/src/cordova/android/import_messages.mjs

-    .replace(/</g, '\\<')
-    .replace(/>/g, '\\>;')
-    .replace(/&/g, '\\&');
+  return str.replace(/"/g, '\\"').replace(/'/g, "\\'").replace(/</g, '\\<').replace(/>/g, '\\>;').replace(/&/g, '\\&');


client/src/cordova/android/import_messages.mjs

-    .replace(/</g, '\\<')
-    .replace(/>/g, '\\>;')
-    .replace(/&/g, '\\&');
+  return str.replace(/"/g, '\\"').replace(/'/g, "\\'").replace(/</g, '\\<').replace(/>/g, '\\>;').replace(/&/g, '\\&');


client/src/cordova/android/import_messages.mjs

-    .replace(/</g, '\\<')
-    .replace(/>/g, '\\>;')
-    .replace(/&/g, '\\&');
+  return str.replace(/"/g, '\\"').replace(/'/g, "\\'").replace(/</g, '\\<').replace(/>/g, '\\>;').replace(/&/g, '\\&');


client/src/cordova/android/import_messages.mjs

-    .replace(/</g, '\\<')
-    .replace(/>/g, '\\>;')
-    .replace(/&/g, '\\&');
+  return str.replace(/"/g, '\\"').replace(/'/g, "\\'").replace(/</g, '\\<').replace(/>/g, '\\>;').replace(/&/g, '\\&');


fortuna

A number of tests are still failing, so I think there's still stuff to figure out.

client/third_party/jsign/.gitignore

README.md

client/README.md

tools/OutlineService/OutlineService/bin/Release/OutlineService.exe.config

daniellacosse · 2024-02-22T02:52:05Z

A number of tests are still failing, so I think there's still stuff to figure out.

Sorry I prematurely took this out of draft. Let me put it back into draft mode.

client/src/cordova/android/import_messages.mjs

jyyi1

For the Windows build failure, we just need to specify the projectDir when calling electron-builder (currently it's D:\a\outline-apps\outline-apps, but it should be D:\a\outline-apps\outline-apps\client because env.nsh will be generated there), similar to what we did in manager.

daniellacosse · 2024-03-07T11:14:11Z

@jyyi1 I've updated the SDK - didn't you say some naming changed? What should I fix

jyyi1 · 2024-03-07T21:32:54Z

@jyyi1 I've updated the SDK - didn't you say some naming changed? What should I fix

Basically anytime you see an error: dialer.Dial undefined (type transport.StreamDialer has no field or method Dial), just rename the Dial in the source code to DialStream (if the error message mentions StreamDialer) or DialPacket (if the error message mentions PacketDialer).

daniellacosse · 2024-03-14T04:42:40Z

For the Windows build failure, we just need to specify the projectDir when calling electron-builder (currently it's D:\a\outline-apps\outline-apps, but it should be D:\a\outline-apps\outline-apps\client because env.nsh will be generated there), similar to what we did in manager.

I'm not really sure where it's looking for the env.nsh and the surrounding files here don't really give me a clue:

outline-apps/client/src/electron/custom_install_steps.nsh

Lines 19 to 20 in 9229b6d

	!include env.nsh

I've tried copying it to several directories and it still fails to find it. Any ideas?

fortuna · 2024-03-14T19:18:28Z

server_manager/electron_app/build.action.sh

@@ -50,7 +50,7 @@ if [[ -z "${WEBPACK_MODE:-}" ]]; then
 fi

 # Build the Web App.
-node src/build/run_action.mjs server_manager/web_app/build
+node client/src/build/run_action.mjs server_manager/web_app/build


Why is the Manager referring to the client?

I need to hoist the build folder into the root, I'm planning on doing that next

fortuna · 2024-03-14T19:29:09Z

@daniellacosse can we perhaps only migrate Cordova in this PR so we can move forward quickly?

daniellacosse · 2024-03-14T22:35:26Z

@daniellacosse can we perhaps only migrate Cordova in this PR so we can move forward quickly?

Yes!! I asked in the chat if we were okay with that but I guess it got lost. I can try to make that work once I get back.

…ders (#1934) * chore(www): add `meaning` attribute to messages with mismatched number of placeholders * Use a more specific meaning.

* init commit * revert this * Update app_paths.ts * Update go_vpn_tunnel.ts

…" (#1939) This reverts commit d378ced.

…1940)

github-actions bot added the size/XXL label Feb 12, 2024

daniellacosse added the needs discussion label Feb 12, 2024

github-advanced-security bot found potential problems Feb 12, 2024

View reviewed changes

daniellacosse added client code health Improvements to code or maintainability cleanup needs test Pull requests that require tests labels Feb 12, 2024

daniellacosse mentioned this pull request Feb 12, 2024

chore(manager): move the manager and rename the repository to outline_apps #1834

Merged

daniellacosse changed the title ~~proposal(client): move the client to its own subfolder and rename the repository to outline-apps~~ proposal(client): move the client to its own subfolder Feb 21, 2024

daniellacosse marked this pull request as ready for review February 21, 2024 21:05

daniellacosse requested review from fortuna and a team as code owners February 21, 2024 21:05

daniellacosse changed the title ~~proposal(client): move the client to its own subfolder~~ chore(client): move the client to its own subfolder Feb 21, 2024

fortuna requested changes Feb 21, 2024

View reviewed changes

daniellacosse marked this pull request as draft February 22, 2024 02:51

daniellacosse removed needs test Pull requests that require tests needs discussion labels Feb 22, 2024

daniellacosse requested review from fortuna and jyyi1 February 22, 2024 04:03

github-advanced-security bot found potential problems Feb 22, 2024

View reviewed changes

client/src/cordova/android/import_messages.mjs Fixed Show fixed Hide fixed

daniellacosse force-pushed the daniellacosse/contain_cordova branch 2 times, most recently from a982523 to 3eb6a85 Compare February 28, 2024 01:19

jyyi1 reviewed Feb 29, 2024

View reviewed changes

daniellacosse force-pushed the daniellacosse/contain_cordova branch from 767dc3f to 92aaae9 Compare March 5, 2024 08:52

daniellacosse force-pushed the daniellacosse/contain_cordova branch 2 times, most recently from 896396c to 3bafef8 Compare March 13, 2024 14:42

github-actions bot added size/XL and removed size/XXL labels Mar 13, 2024

daniellacosse force-pushed the daniellacosse/contain_cordova branch from 6894a19 to 9229b6d Compare March 14, 2024 04:17

fortuna requested changes Mar 14, 2024

View reviewed changes

chore(client): move the client to its own subfolder

9f6190a

daniellacosse force-pushed the daniellacosse/contain_cordova branch from b3961a4 to 9f6190a Compare April 1, 2024 18:14

sbruens and others added 5 commits April 1, 2024 14:16

chore(www): add meaning attribute to messages with updated placehol…

68e75d6

…ders (#1934) * chore(www): add `meaning` attribute to messages with mismatched number of placeholders * Use a more specific meaning.

fix(client/electron): properly link tun2socks binary (#1936)

3cb3fe3

* init commit * revert this * Update app_paths.ts * Update go_vpn_tunnel.ts

Revert "fix(cordova/ios/apple): add app icons for mac catalyst (#1792)…

c5c02a2

…" (#1939) This reverts commit d378ced.

chore(client/electron/build): remove the "Beta" from the title bar (#…

56240b0

…1940)

chore(client): move the client to its own subfolder

cfb7ef9

daniellacosse closed this Apr 1, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore(client): move the client to its own subfolder #1838

chore(client): move the client to its own subfolder #1838

daniellacosse commented Feb 12, 2024 •

edited

Loading

fortuna left a comment

daniellacosse commented Feb 22, 2024 •

edited

Loading

jyyi1 left a comment

daniellacosse commented Mar 7, 2024

jyyi1 commented Mar 7, 2024

daniellacosse commented Mar 14, 2024 •

edited

Loading

fortuna Mar 14, 2024

daniellacosse Mar 14, 2024

fortuna commented Mar 14, 2024

daniellacosse commented Mar 14, 2024

chore(client): move the client to its own subfolder #1838

chore(client): move the client to its own subfolder #1838

Conversation

daniellacosse commented Feb 12, 2024 • edited Loading

fortuna left a comment

Choose a reason for hiding this comment

daniellacosse commented Feb 22, 2024 • edited Loading

jyyi1 left a comment

Choose a reason for hiding this comment

daniellacosse commented Mar 7, 2024

jyyi1 commented Mar 7, 2024

daniellacosse commented Mar 14, 2024 • edited Loading

fortuna Mar 14, 2024

Choose a reason for hiding this comment

daniellacosse Mar 14, 2024

Choose a reason for hiding this comment

fortuna commented Mar 14, 2024

daniellacosse commented Mar 14, 2024

daniellacosse commented Feb 12, 2024 •

edited

Loading

daniellacosse commented Feb 22, 2024 •

edited

Loading

daniellacosse commented Mar 14, 2024 •

edited

Loading